Repository navigation
Conversation
Owner
|
Thanks for the initiative. I think the Podman/Docker socket detection should come first: either as part of this PR or as a separate one, if this PR is strictly packaging-focused. Either way works for me. And I do think mac apps should use the proper packaging - be it app or dmg - whichever is more appropriate. I did the whole packaging thing before, but couldn't test the Podman part with nested virtualization, and put it on hold. |
BKPepe
force-pushed
the
macos-support
branch
2 times, most recently
from
August 12, 2026 09:30
3862219 to
5eacd1d
Compare
The slint crate was only declared for Linux and Windows targets, so on macOS i-slint-backend-winit compiled without any renderer feature and the build failed. Fold macOS into the shared native slint target (winit backend with the Skia renderer). Embed an Info.plist generated from CARGO_PKG_VERSION into the __TEXT,__info_plist section of the binary so the About panel shows the application name, version, copyright and project URL without an .app bundle, the macOS counterpart of the winresource metadata on Windows. Detect the default Podman machine API socket in $TMPDIR so a running Podman machine is found without DOCKER_HOST or the Podman system helper; DOCKER_HOST, CONTAINER_HOST and the Docker socket defaults still apply otherwise. Verified end-to-end on macOS 26 (arm64) with Podman: engine autodetection, image builder download and a firmware build for mvebu/cortexa9. Co-Authored-By: George Sapkin <george@sapk.in> Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Document the container engine setup on macOS (automatic detection of the default Podman machine socket, DOCKER_HOST for custom setups) and that image builder images live inside the Podman/Docker VM there, as on Windows. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Add macos-latest (Apple silicon) to the build matrix and package the binary as a macos-aarch64 release asset. Unlike Linux and Windows, the binary is not compressed with upx: UPX-packed Mach-O binaries are not reliable on modern macOS; the release profile already strips symbols. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
GeorgeSapkin
force-pushed
the
macos-support
branch
from
August 13, 2026 12:46
5eacd1d to
535e09a
Compare
Owner
|
Rebased. I'm slowly looking through my old macOS support implementation, so I'll add some questions as I think of them. Does it make sense to add/test x86/64 support? I did this before: strategy:
matrix:
include:
- os: macos-latest
target: aarch64-apple-darwin
artifact: bouwer-macos-latest-aarch64
- os: macos-latest
target: x86_64-apple-darwin
artifact: bouwer-macos-latest-x86_64
- os: ubuntu-latest
target: x86_64-unknown-linux-gnu
artifact: bouwer-ubuntu-latest
- os: windows-latest
target: x86_64-pc-windows-msvc
artifact: bouwer-windows-latestThis is what I had for dmg support: - name: Package macOS
if: matrix.os == 'macos-latest'
run: |
cargo install cargo-packager --locked
cargo packager --release --formats dmg --target ${{ matrix.target }}and then including in the upload, of course: - name: Upload binary
uses: actions/upload-artifact@v7
with:
name: ${{ matrix.artifact }}
path: |
target/${{ matrix.target }}/release/bouwer
target/${{ matrix.target }}/release/bouwer.exe
target/${{ matrix.target }}/release/packager/**/*.dmg
if-no-files-found: errorand: - name: Create GitHub release
uses: softprops/action-gh-release@v2
with:
files: |
dist/*.dmg
dist/*.tar.gz
dist/*.zip
generate_release_notes: trueIDK, which metadata goes where, but I only see this in my old implementation, i.e. no plist stuff: [package.metadata.packager]
name = "Bouwer"
identifier = "in.sapk.bouwer"
icon = ["assets/logo.png"]
resources = ["LICENSE"]
[package.metadata.packager.macos]
minimum_system_version = "11.0" |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
This makes Bouwer build and run on macOS and fills in the missing macOS metadata, tested end-to-end on real hardware — the README said there was no practical way to test macOS, so hopefully this helps:
slintwas only declared for Linux/Windows targets, soi-slint-backend-winitcompiled without any renderer feature on macOS and the build failed. Adds a macOS target section mirroring the Linux one (winit backend + Skia renderer).build.rsnow generates an Info.plist fromCARGO_PKG_VERSIONand links it into the__TEXT,__info_plistsection — the macOS counterpart of thewinresourcemetadata on Windows. The About panel now shows name, version, copyright and the project URL, andCFBundleNamefixes the app menu title to "Bouwer".Testing
Verified on macOS 26.5.2, Apple silicon (arm64), Rust 1.97.1, Podman 6.0.2 (podman machine), Bouwer 0.3.0:
cargo check/cargo buildpass (they fail onmainwithout the Cargo.toml change).DOCKER_HOSTpointing at the Podman machine socket; version and profile metadata load, cache and config land in~/Library/Caches/bouwerand~/Library/Application Support/bouwer.openwrt/imagebuilder:mvebu-cortexa9-25.12.5image (1.92 GB) from the app and built firmware for the CZ.NIC Turris Omnia profile — all output images produced andsha256sumsverify OK; the build container is cleaned up afterwards.Known remaining gaps on macOS
Containers::newonly probes Linux-style Podman socket paths, so withoutpodman-mac-helperorDOCKER_HOST/CONTAINER_HOSTthe Podman machine socket ($TMPDIR/podman/podman-machine-default-api.sock) is not found. Happy to send a follow-up PR adding that path to the detection if you want..appbundle, which felt like a bigger decision than this PR should make.🤖 Generated with Claude Code